Bump rustc version

diff --git a/Cargo.lock b/Cargo.lock
index cc08e3f2c5b6d5112d0d8c68665c4cd8d9c7e33c..368da9e1b66b2df92f4c3654b8fdb204d1317726 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,7 +19,7 @@ dependencies = [
 [[package]]
 name = "curl"
 version = "0.1.0"
-source = "git+https://github.com/carllerche/curl-rust#6f007b4967ec12e36937dcb081abe0bdb3bcc508"
+source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce"
 dependencies = [
  "curl-sys 0.1.0 (git+https://github.com/carllerche/curl-rust)",
  "url 0.2.2 (git+https://github.com/servo/rust-url)",
@@ -28,7 +28,7 @@ dependencies = [
 [[package]]
 name = "curl-sys"
 version = "0.1.0"
-source = "git+https://github.com/carllerche/curl-rust#6f007b4967ec12e36937dcb081abe0bdb3bcc508"
+source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb3962dc87a18df9ce"
 dependencies = [
  "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)",
  "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)",
@@ -43,7 +43,7 @@ source = "git+https://github.com/docopt/docopt.rs#38cc4572bef4dc5cbcb7526500aa14
 [[package]]
 name = "flate2"
 version = "0.1.0"
-source = "git+https://github.com/alexcrichton/flate2-rs#5cf5e4f57166053590a7f63507f65da72d4e74eb"
+source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea"
 dependencies = [
  "miniz-sys 0.1.0 (git+https://github.com/alexcrichton/flate2-rs)",
 ]
@@ -61,7 +61,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "git2"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#53785d74f5199455501c4ece0c9dd325a01db894"
+source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d"
 dependencies = [
  "libgit2-sys 0.0.1 (git+https://github.com/alexcrichton/git2-rs)",
  "time 0.1.1 (git+https://github.com/rust-lang/time)",
@@ -71,7 +71,7 @@ dependencies = [
 [[package]]
 name = "glob"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/glob#6b26e61315196f198ce9f6553912c0378e399153"
+source = "git+https://github.com/rust-lang/glob#7e1bd4c5917fde41861ee93e067d5d84d3caf5d1"
 
 [[package]]
 name = "hamcrest"
@@ -81,7 +81,7 @@ source = "git+https://github.com/carllerche/hamcrest-rust.git#2b9bd6cdae5dcf08ac
 [[package]]
 name = "libgit2-sys"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#53785d74f5199455501c4ece0c9dd325a01db894"
+source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d"
 dependencies = [
  "libssh2-sys 0.0.1 (git+https://github.com/alexcrichton/ssh2-rs)",
  "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)",
@@ -109,7 +109,7 @@ dependencies = [
 [[package]]
 name = "miniz-sys"
 version = "0.1.0"
-source = "git+https://github.com/alexcrichton/flate2-rs#5cf5e4f57166053590a7f63507f65da72d4e74eb"
+source = "git+https://github.com/alexcrichton/flate2-rs#c8ecf7a411bc6d43bf885f487c01e536490f2aea"
 dependencies = [
  "gcc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -142,7 +142,7 @@ dependencies = [
 [[package]]
 name = "semver"
 version = "0.1.3"
-source = "git+https://github.com/rust-lang/semver#9ea3324350693954d3e5d10d43e240db224deff9"
+source = "git+https://github.com/rust-lang/semver#c09b5bdf6b2fcaa719da588a7da98b1145264f56"
 
 [[package]]
 name = "tar"
@@ -165,5 +165,5 @@ source = "git+https://github.com/alexcrichton/toml-rs#25e10a82565d81b5243304c835
 [[package]]
 name = "url"
 version = "0.2.2"
-source = "git+https://github.com/servo/rust-url#bdda3a7bb946e5f85dd3daeefb54c06fffa8350c"
+source = "git+https://github.com/servo/rust-url#c54ef93a7bfdd7a43b33571b9614376aa5279181"
 

diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs
index 97a2dc71cde06664e153f2676a0b13e9269261d1..67c8a0a02047d4e54fc3b9ec3539f1cfbf94aeb8 100644 (file)
--- a/src/cargo/core/dependency.rs
+++ b/src/cargo/core/dependency.rs
@@ -22,7 +22,7 @@ pub struct Dependency {
     only_for_platform: Option<String>,
 }
 
-#[deriving(PartialEq, Clone, Show)]
+#[deriving(PartialEq, Clone, Show, Copy)]
 pub enum Kind {
     Normal,
     Development,

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index c72ee2313ebce66c959d1987ead2e9c94647eb4a..51c16ff27965ab3046bfbe508824532d205a6230 100644 (file)
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -81,7 +81,7 @@ impl<E, S: Encoder<E>> Encodable<S, E> for Manifest {
     }
 }
 
-#[deriving(Show, Clone, PartialEq, Hash, Encodable)]
+#[deriving(Show, Clone, PartialEq, Hash, Encodable, Copy)]
 pub enum LibKind {
     Lib,
     Rlib,

diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index 1c6c592dfe6d050f2bb07a46086192e9f4606a90..c2c89da5c869ca5941a6088418289308f2a05701 100644 (file)
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -63,7 +63,7 @@ pub struct PackageRegistry<'a> {
     locked: HashMap<SourceId, HashMap<String, Vec<(PackageId, Vec<PackageId>)>>>,
 }
 
-#[deriving(PartialEq, Eq)]
+#[deriving(PartialEq, Eq, Copy)]
 enum Kind {
     Override,
     Locked,

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 956a3f3b877815f9eb57901abfbbb36294840a33..1318a9ec30d34bb1fead48b7d97f4e57af4e3a3e 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -29,6 +29,7 @@ pub struct Resolve {
     metadata: Option<Metadata>,
 }
 
+#[deriving(Copy)]
 pub enum Method<'a> {
     Everything,
     Required(/* dev_deps = */ bool,

diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
index 191b5a7b2b20c4f60aa710b89bbc58df7c99b68f..7a83ac4914fee89615b41d316b7d311964d84ab4 100644 (file)
--- a/src/cargo/core/shell.rs
+++ b/src/cargo/core/shell.rs
@@ -6,6 +6,7 @@ use std::fmt::Show;
 
 use self::AdequateTerminal::{NoColor, Colored};
 
+#[deriving(Copy)]
 pub struct ShellConfig {
     pub color: bool,
     pub verbose: bool,

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index def445d898ee50f12afcda3af903f01c0f346d13..468b4f136327c9be752738b8fab66ef28d80426b 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -11,7 +11,7 @@ use super::TargetConfig;
 use super::layout::{Layout, LayoutProxy};
 use super::custom_build::BuildState;
 
-#[deriving(Show)]
+#[deriving(Show, Copy)]
 pub enum Platform {
     Target,
     Plugin,

diff --git a/src/cargo/ops/cargo_rustc/job_queue.rs b/src/cargo/ops/cargo_rustc/job_queue.rs
index 256ee73cd23ea9acc58630b17a852465033ed567..221dbdec68953ee413182eb5e25fda1c5f16b701 100644 (file)
--- a/src/cargo/ops/cargo_rustc/job_queue.rs
+++ b/src/cargo/ops/cargo_rustc/job_queue.rs
@@ -47,7 +47,7 @@ struct PendingBuild {
 ///
 /// Each build step for a package is registered with one of these stages, and
 /// each stage has a vector of work to perform in parallel.
-#[deriving(Hash, PartialEq, Eq, Clone, PartialOrd, Ord, Show)]
+#[deriving(Hash, PartialEq, Eq, Clone, PartialOrd, Ord, Show, Copy)]
 pub enum Stage {
     Start,
     BuildCustomBuild,

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index c8543f5ebd5769f1189981735cc9fe77c9a9db71..8f8056cda9fa62f29d8684d9e9665309a02213a3 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -25,7 +25,7 @@ mod job_queue;
 mod layout;
 mod links;
 
-#[deriving(PartialEq, Eq, Hash, Show)]
+#[deriving(PartialEq, Eq, Hash, Show, Copy)]
 pub enum Kind { Host, Target }
 
 #[deriving(Default, Clone)]

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 840af09e001ff0d6ce0747ebdea0b1cc5dfaaf2f..f49ce854454fc120531d0a2bd44b56c9abcfe2b0 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -93,7 +93,7 @@ impl<'a> Config<'a> {
     }
 }
 
-#[deriving(Eq,PartialEq,Clone,Encodable,Decodable)]
+#[deriving(Eq, PartialEq, Clone, Encodable, Decodable, Copy)]
 pub enum Location {
     Project,
     Global

diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs
index 93d52142179582ce21f94280fc1dc23560372d4c..3f2414e180171ef71f95fb5b53c8d013675c7777 100644 (file)
--- a/src/cargo/util/dependency_queue.rs
+++ b/src/cargo/util/dependency_queue.rs
@@ -39,7 +39,7 @@ pub struct DependencyQueue<K, V> {
 ///
 /// A fresh package does not necessarily need to be rebuilt (unless a dependency
 /// was also rebuilt), and a dirty package must always be rebuilt.
-#[deriving(PartialEq, Eq, Show)]
+#[deriving(PartialEq, Eq, Show, Copy)]
 pub enum Freshness {
     Fresh,
     Dirty,

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index bdacd347f08e7fc42eba95e7e71485892ccd997b..6bcbdef217ac76986bf3aa41a3f58b3308824aed 100644 (file)
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -228,6 +228,7 @@ pub struct TomlProfiles {
 }
 
 #[deriving(Decodable, Clone, Default)]
+#[allow(missing_copy_implementations)]
 pub struct TomlProfile {
     opt_level: Option<uint>,
     lto: Option<bool>,
@@ -673,6 +674,7 @@ fn normalize(libs: &[TomlLibTarget],
     log!(4, "normalizing toml targets; lib={}; bin={}; example={}; test={}, benches={}",
          libs, bins, examples, tests, benches);
 
+    #[deriving(Copy)]
     enum TestDep { Needed, NotNeeded }
 
     fn merge(profile: Profile, toml: &Option<TomlProfile>) -> Profile {

diff --git a/src/cargo/util/vcs.rs b/src/cargo/util/vcs.rs
index 3528875aa57e46571998667a75f67e4232003359..f18d6dcc4f662f6bb833b401e1185664173f7661 100644 (file)
--- a/src/cargo/util/vcs.rs
+++ b/src/cargo/util/vcs.rs
@@ -1,3 +1,5 @@
+#![allow(missing_copy_implementations)]
+
 use git2;
 
 use util::{CargoResult, process};

diff --git a/src/registry/lib.rs b/src/registry/lib.rs
index 4ff2b27308e18cac9802f2f0d37c7aa12381b9fa..d875768085cef347a7247ad483f8f9d96dd2053e 100644 (file)
--- a/src/registry/lib.rs
+++ b/src/registry/lib.rs
@@ -20,7 +20,7 @@ pub struct Registry {
 
 pub type Result<T> = result::Result<T, Error>;
 
-#[deriving(PartialEq)]
+#[deriving(PartialEq, Copy)]
 pub enum Auth {
     Authorized,
     Unauthorized

diff --git a/src/rustversion.txt b/src/rustversion.txt
index 1ff25f20e4dab3900ce80dcbbfed783ff68492c7..e0243f047457e512df57ea92e2f5146b7110f6a9 100644 (file)
--- a/src/rustversion.txt
+++ b/src/rustversion.txt
@@ -1 +1 @@
-2014-12-06
+2014-12-12